From d7c8c1894e8bc6b5011814ada9dacceea4161da2 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Sat, 3 Jun 2017 11:02:14 -0700 Subject: [PATCH] Remove stray Registry impls They're basically barely used now anyway. --- src/cargo/core/registry.rs | 26 +------------------------- src/cargo/sources/path.rs | 7 ++++++- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/src/cargo/core/registry.rs b/src/cargo/core/registry.rs index c8716f1b1..903c40e27 100644 --- a/src/cargo/core/registry.rs +++ b/src/cargo/core/registry.rs @@ -1,7 +1,7 @@ use std::cell::RefCell; use std::collections::HashMap; -use core::{Source, SourceId, SourceMap, Summary, Dependency, PackageId, Package}; +use core::{Source, SourceId, SourceMap, Summary, Dependency, PackageId}; use core::PackageSet; use util::{Config, profile}; use util::errors::{CargoResult, CargoResultExt}; @@ -31,30 +31,6 @@ pub trait Registry { } } -impl Registry for Vec { - fn query(&mut self, - dep: &Dependency, - f: &mut FnMut(Summary)) -> CargoResult<()> { - for summary in self.iter().filter(|summary| dep.matches(*summary)) { - f(summary.clone()); - } - Ok(()) - } -} - -impl Registry for Vec { - fn query(&mut self, - dep: &Dependency, - f: &mut FnMut(Summary)) -> CargoResult<()> { - for summary in self.iter() - .map(|p| p.summary()) - .filter(|summary| dep.matches(*summary)) { - f(summary.clone()); - } - Ok(()) - } -} - impl<'a, T: ?Sized + Registry + 'a> Registry for Box { fn query(&mut self, dep: &Dependency, diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs index 2f3c30141..442524df1 100644 --- a/src/cargo/sources/path.rs +++ b/src/cargo/sources/path.rs @@ -320,7 +320,12 @@ impl<'cfg> Registry for PathSource<'cfg> { fn query(&mut self, dep: &Dependency, f: &mut FnMut(Summary)) -> CargoResult<()> { - self.packages.query(dep, f) + for s in self.packages.iter().map(|p| p.summary()) { + if dep.matches(s) { + f(s.clone()) + } + } + Ok(()) } } -- 2.30.2